Use try! instead of CliError::from_boxed

This From impl has been around for awhile.

diff --git a/src/bin/bench.rs b/src/bin/bench.rs
index 6f4d5db182297a9db5d03999dfe5483f5ca4bd90..691f4e33a2e5ff09f3de98edc94aadcd52c4063b 100644 (file)
--- a/src/bin/bench.rs
+++ b/src/bin/bench.rs
@@ -89,10 +89,7 @@ pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
         },
     };
 
-    let err = try!(ops::run_benches(&root, &ops,
-                                    &options.arg_args).map_err(|err| {
-        CliError::from_boxed(err, 101)
-    }));
+    let err = try!(ops::run_benches(&root, &ops, &options.arg_args));
     match err {
         None => Ok(None),
         Some(err) => {

diff --git a/src/bin/build.rs b/src/bin/build.rs
index 6a5ca18b6f1150b75c3b842077869fcd481f6a8d..428eac4c493508b13df1d514e6d41ff1ccfcfe11 100644 (file)
--- a/src/bin/build.rs
+++ b/src/bin/build.rs
@@ -3,7 +3,7 @@ use std::env;
 use cargo::ops::CompileOptions;
 use cargo::ops;
 use cargo::util::important_paths::{find_root_manifest_for_wd};
-use cargo::util::{CliResult, CliError, Config};
+use cargo::util::{CliResult, Config};
 
 #[derive(RustcDecodable)]
 struct Options {
@@ -85,7 +85,6 @@ pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
         target_rustc_args: None,
     };
 
-    ops::compile(&root, &opts).map(|_| None).map_err(|err| {
-        CliError::from_boxed(err, 101)
-    })
+    try!(ops::compile(&root, &opts));
+    Ok(None)
 }

diff --git a/src/bin/clean.rs b/src/bin/clean.rs
index 8150917fa26b384bc8e6fa6bde253490d9cfbaa9..e4345f843dc448cb1f98c8d3ca0be95acea0efbc 100644 (file)
--- a/src/bin/clean.rs
+++ b/src/bin/clean.rs
@@ -1,7 +1,7 @@
 use std::env;
 
 use cargo::ops;
-use cargo::util::{CliResult, CliError, Config};
+use cargo::util::{CliResult, Config};
 use cargo::util::important_paths::{find_root_manifest_for_wd};
 
 #[derive(RustcDecodable)]
@@ -49,7 +49,6 @@ pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
         target: options.flag_target.as_ref().map(|s| &s[..]),
         release: options.flag_release,
     };
-    ops::clean(&root, &opts).map(|_| None).map_err(|err| {
-      CliError::from_boxed(err, 101)
-    })
+    try!(ops::clean(&root, &opts));
+    Ok(None)
 }

diff --git a/src/bin/doc.rs b/src/bin/doc.rs
index f75ac83313bd1ef402245a04e12e033956f0d2d6..651b8c39fc7ece0b55adc7d2c8336ecd0adbe0d9 100644 (file)
--- a/src/bin/doc.rs
+++ b/src/bin/doc.rs
@@ -1,5 +1,5 @@
 use cargo::ops;
-use cargo::util::{CliResult, CliError, Config};
+use cargo::util::{CliResult, Config};
 use cargo::util::important_paths::{find_root_manifest_for_wd};
 
 #[derive(RustcDecodable)]
@@ -74,9 +74,6 @@ pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
         },
     };
 
-    try!(ops::doc(&root, &doc_opts).map_err(|err| {
-        CliError::from_boxed(err, 101)
-    }));
-
+    try!(ops::doc(&root, &doc_opts));
     Ok(None)
 }

diff --git a/src/bin/fetch.rs b/src/bin/fetch.rs
index c9737571f076ee648ad84a7f6810c14d20db9f7f..96d2d9541f3249dadf8cab388ab47c8bba295c9c 100644 (file)
--- a/src/bin/fetch.rs
+++ b/src/bin/fetch.rs
@@ -1,5 +1,5 @@
 use cargo::ops;
-use cargo::util::{CliResult, CliError, Config};
+use cargo::util::{CliResult, Config};
 use cargo::util::important_paths::find_root_manifest_for_wd;
 
 #[derive(RustcDecodable)]
@@ -37,9 +37,7 @@ pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
     try!(config.shell().set_verbosity(options.flag_verbose, options.flag_quiet));
     try!(config.shell().set_color_config(options.flag_color.as_ref().map(|s| &s[..])));
     let root = try!(find_root_manifest_for_wd(options.flag_manifest_path, config.cwd()));
-    try!(ops::fetch(&root, config).map_err(|e| {
-        CliError::from_boxed(e, 101)
-    }));
+    try!(ops::fetch(&root, config));
     Ok(None)
 }
 

diff --git a/src/bin/generate_lockfile.rs b/src/bin/generate_lockfile.rs
index 1e006bdf3344dda53fe4336acbb8f0b10121ae76..5bf4950a15082cf2c3e6cbb4659726692aea66bf 100644 (file)
--- a/src/bin/generate_lockfile.rs
+++ b/src/bin/generate_lockfile.rs
@@ -1,7 +1,7 @@
 use std::env;
 
 use cargo::ops;
-use cargo::util::{CliResult, CliError, Config};
+use cargo::util::{CliResult, Config};
 use cargo::util::important_paths::find_root_manifest_for_wd;
 
 #[derive(RustcDecodable)]
@@ -32,6 +32,6 @@ pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
     try!(config.shell().set_color_config(options.flag_color.as_ref().map(|s| &s[..])));
     let root = try!(find_root_manifest_for_wd(options.flag_manifest_path, config.cwd()));
 
-    ops::generate_lockfile(&root, config)
-        .map(|_| None).map_err(|err| CliError::from_boxed(err, 101))
+    try!(ops::generate_lockfile(&root, config));
+    Ok(None)
 }

diff --git a/src/bin/login.rs b/src/bin/login.rs
index bfcc2f8ae3d00f67da6f378ce95d64ee86ecf1a8..2f60631d60f46f39a84260784d0e591b270f4745 100644 (file)
--- a/src/bin/login.rs
+++ b/src/bin/login.rs
@@ -4,7 +4,7 @@ use std::io;
 use cargo::ops;
 use cargo::core::{SourceId, Source};
 use cargo::sources::RegistrySource;
-use cargo::util::{CliResult, CliError, Config};
+use cargo::util::{CliResult, Config, human, ChainError};
 
 #[derive(RustcDecodable)]
 struct Options {
@@ -36,28 +36,23 @@ pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
     let token = match options.arg_token.clone() {
         Some(token) => token,
         None => {
-            let err = (|| {
-                let src = try!(SourceId::for_central(config));
-                let mut src = RegistrySource::new(&src, config);
-                try!(src.update());
-                let config = try!(src.config());
-                let host = options.flag_host.clone().unwrap_or(config.api);
-                println!("please visit {}me and paste the API Token below",
-                         host);
-                let mut line = String::new();
-                let input = io::stdin();
-                try!(input.lock().read_line(&mut line));
-                Ok(line)
-            })();
-
-            try!(err.map_err(|e| CliError::from_boxed(e, 101)))
+            let src = try!(SourceId::for_central(config));
+            let mut src = RegistrySource::new(&src, config);
+            try!(src.update());
+            let config = try!(src.config());
+            let host = options.flag_host.clone().unwrap_or(config.api);
+            println!("please visit {}me and paste the API Token below", host);
+            let mut line = String::new();
+            let input = io::stdin();
+            try!(input.lock().read_line(&mut line).chain_error(|| {
+                human("failed to read stdin")
+            }));
+            line
         }
     };
 
     let token = token.trim().to_string();
-    try!(ops::registry_login(config, token).map_err(|e| {
-        CliError::from_boxed(e, 101)
-    }));
+    try!(ops::registry_login(config, token));
     Ok(None)
 }
 

diff --git a/src/bin/new.rs b/src/bin/new.rs
index cc72b74111a9b2f2f6014117d50dfd8066ee3acd..5b0554af92787c52b6e7da2e093475cbca622dcd 100644 (file)
--- a/src/bin/new.rs
+++ b/src/bin/new.rs
@@ -1,7 +1,7 @@
 use std::env;
 
 use cargo::ops;
-use cargo::util::{CliResult, CliError, Config};
+use cargo::util::{CliResult, Config};
 
 #[derive(RustcDecodable)]
 struct Options {
@@ -47,8 +47,7 @@ pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
         name: flag_name.as_ref().map(|s| s.as_ref()),
     };
 
-    ops::new(opts, config).map(|_| None).map_err(|err| {
-        CliError::from_boxed(err, 101)
-    })
+    try!(ops::new(opts, config));
+    Ok(None)
 }
 

diff --git a/src/bin/owner.rs b/src/bin/owner.rs
index 74cf39e2e3796ba1465d31eb04271e494d07b0d1..b40fc3f692ba621beda8a53b5d10f6d3e0f1d5fd 100644 (file)
--- a/src/bin/owner.rs
+++ b/src/bin/owner.rs
@@ -1,5 +1,5 @@
 use cargo::ops;
-use cargo::util::{CliResult, CliError, Config};
+use cargo::util::{CliResult, Config};
 
 #[derive(RustcDecodable)]
 struct Options {
@@ -51,9 +51,7 @@ pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
         to_remove: options.flag_remove,
         list: options.flag_list,
     };
-    try!(ops::modify_owners(config, &opts).map_err(|e| {
-        CliError::from_boxed(e, 101)
-    }));
+    try!(ops::modify_owners(config, &opts));
     Ok(None)
 }
 

diff --git a/src/bin/package.rs b/src/bin/package.rs
index 63edc3baed89d7e142315a6761b8d88e6e321433..f5f89c35f259d4e4c0462cd207923ef6ae33cfa4 100644 (file)
--- a/src/bin/package.rs
+++ b/src/bin/package.rs
@@ -1,5 +1,5 @@
 use cargo::ops;
-use cargo::util::{CliResult, CliError, Config};
+use cargo::util::{CliResult, Config};
 use cargo::util::important_paths::find_root_manifest_for_wd;
 
 #[derive(RustcDecodable)]
@@ -35,10 +35,9 @@ pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
     try!(config.shell().set_verbosity(options.flag_verbose, options.flag_quiet));
     try!(config.shell().set_color_config(options.flag_color.as_ref().map(|s| &s[..])));
     let root = try!(find_root_manifest_for_wd(options.flag_manifest_path, config.cwd()));
-    ops::package(&root, config,
-                 !options.flag_no_verify,
-                 options.flag_list,
-                 !options.flag_no_metadata).map(|_| None).map_err(|err| {
-        CliError::from_boxed(err, 101)
-    })
+    try!(ops::package(&root, config,
+                      !options.flag_no_verify,
+                      options.flag_list,
+                      !options.flag_no_metadata));
+    Ok(None)
 }

diff --git a/src/bin/pkgid.rs b/src/bin/pkgid.rs
index b95294e0c8254a59eecc74df6665e7bd7d6d71bb..6446e1587045b95e82b7b36fe3148580c6fa9924 100644 (file)
--- a/src/bin/pkgid.rs
+++ b/src/bin/pkgid.rs
@@ -1,5 +1,5 @@
 use cargo::ops;
-use cargo::util::{CliResult, CliError, Config};
+use cargo::util::{CliResult, Config};
 use cargo::util::important_paths::{find_root_manifest_for_wd};
 
 #[derive(RustcDecodable)]
@@ -52,9 +52,7 @@ pub fn execute(options: Options,
     let root = try!(find_root_manifest_for_wd(options.flag_manifest_path.clone(), config.cwd()));
 
     let spec = options.arg_spec.as_ref().map(|s| &s[..]);
-    let spec = try!(ops::pkgid(&root, spec, config).map_err(|err| {
-      CliError::from_boxed(err, 101)
-    }));
+    let spec = try!(ops::pkgid(&root, spec, config));
     println!("{}", spec);
     Ok(None)
 }

diff --git a/src/bin/publish.rs b/src/bin/publish.rs
index d70043c0c510673ee3c87fcc0e18f54b2ff6d8b8..fdbbd4ffcf90fa5a4106a985585261ec91baf33c 100644 (file)
--- a/src/bin/publish.rs
+++ b/src/bin/publish.rs
@@ -1,5 +1,5 @@
 use cargo::ops;
-use cargo::util::{CliResult, CliError, Config};
+use cargo::util::{CliResult, Config};
 use cargo::util::important_paths::find_root_manifest_for_wd;
 
 #[derive(RustcDecodable)]
@@ -43,7 +43,6 @@ pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
     } = options;
 
     let root = try!(find_root_manifest_for_wd(flag_manifest_path.clone(), config.cwd()));
-    ops::publish(&root, config, token, host, !no_verify).map(|_| None).map_err(|err| {
-        CliError::from_boxed(err, 101)
-    })
+    try!(ops::publish(&root, config, token, host, !no_verify));
+    Ok(None)
 }

diff --git a/src/bin/read_manifest.rs b/src/bin/read_manifest.rs
index 8fa60b6462f4af1b4749c63f297c003b14fbf4a3..1f1e090546e5eb1184572ac5b36a117e92956344 100644 (file)
--- a/src/bin/read_manifest.rs
+++ b/src/bin/read_manifest.rs
@@ -2,7 +2,7 @@ use std::env;
 use std::error::Error;
 
 use cargo::core::{Package, Source};
-use cargo::util::{CliResult, CliError, Config};
+use cargo::util::{CliResult, Config};
 use cargo::util::important_paths::{find_root_manifest_for_wd};
 use cargo::sources::{PathSource};
 
@@ -31,13 +31,9 @@ pub fn execute(options: Options, config: &Config) -> CliResult<Option<Package>>
 
     let root = try!(find_root_manifest_for_wd(options.flag_manifest_path, config.cwd()));
 
-    let mut source = try!(PathSource::for_path(root.parent().unwrap(), config).map_err(|e| {
-        CliError::new(e.description(), 1)
-    }));
+    let mut source = try!(PathSource::for_path(root.parent().unwrap(), config));
+    try!(source.update());
 
-    try!(source.update().map_err(|err| CliError::new(err.description(), 1)));
-
-    source.root_package()
-          .map(Some)
-          .map_err(|err| CliError::from_boxed(err, 1))
+    let pkg = try!(source.root_package());
+    Ok(Some(pkg))
 }

diff --git a/src/bin/rustc.rs b/src/bin/rustc.rs
index 7eb86717e3c17eaf7521890df458694bd42b080c..14f9e120b655f360f030d5c8f7d8f92b70aaa9eb 100644 (file)
--- a/src/bin/rustc.rs
+++ b/src/bin/rustc.rs
@@ -3,7 +3,7 @@ use std::env;
 use cargo::ops::CompileOptions;
 use cargo::ops;
 use cargo::util::important_paths::{find_root_manifest_for_wd};
-use cargo::util::{CliResult, CliError, Config};
+use cargo::util::{CliResult, Config};
 
 #[derive(RustcDecodable)]
 struct Options {
@@ -89,8 +89,7 @@ pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
         target_rustc_args: options.arg_opts.as_ref().map(|a| &a[..]),
     };
 
-    ops::compile(&root, &opts).map(|_| None).map_err(|err| {
-        CliError::from_boxed(err, 101)
-    })
+    try!(ops::compile(&root, &opts));
+    Ok(None)
 }
 

diff --git a/src/bin/search.rs b/src/bin/search.rs
index 05c5475855d31cb64b9fcb5c79a845faed602c65..93133a8dcb18fe8a0d5964dde5e1b26647c3daf1 100644 (file)
--- a/src/bin/search.rs
+++ b/src/bin/search.rs
@@ -1,5 +1,5 @@
 use cargo::ops;
-use cargo::util::{CliResult, CliError, Config};
+use cargo::util::{CliResult, Config};
 
 #[derive(RustcDecodable)]
 struct Options {
@@ -34,7 +34,6 @@ pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
         ..
     } = options;
 
-    ops::search(&query, config, host)
-        .map(|_| None)
-        .map_err(|err| CliError::from_boxed(err, 101))
+    try!(ops::search(&query, config, host));
+    Ok(None)
 }

diff --git a/src/bin/test.rs b/src/bin/test.rs
index 532bf35018c09f481361161dc421802f3bce3f51..789dc002b996797f351164a27ad20ede1157f0fc 100644 (file)
--- a/src/bin/test.rs
+++ b/src/bin/test.rs
@@ -95,10 +95,7 @@ pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
         },
     };
 
-    let err = try!(ops::run_tests(&root, &ops,
-                                  &options.arg_args).map_err(|err| {
-        CliError::from_boxed(err, 101)
-    }));
+    let err = try!(ops::run_tests(&root, &ops, &options.arg_args));
     match err {
         None => Ok(None),
         Some(err) => {

diff --git a/src/bin/update.rs b/src/bin/update.rs
index 27842ba8d4c0b0f4b4210718170af02116cb3e5c..92647cfcc433705bade853a2f05e8544bbcbfb8b 100644 (file)
--- a/src/bin/update.rs
+++ b/src/bin/update.rs
@@ -1,7 +1,7 @@
 use std::env;
 
 use cargo::ops;
-use cargo::util::{CliResult, CliError, Config};
+use cargo::util::{CliResult, Config};
 use cargo::util::important_paths::find_root_manifest_for_wd;
 
 #[derive(RustcDecodable)]
@@ -65,7 +65,7 @@ pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
         config: config,
     };
 
-    ops::update_lockfile(&root, &update_opts)
-        .map(|_| None).map_err(|err| CliError::from_boxed(err, 101))
+    try!(ops::update_lockfile(&root, &update_opts));
+    Ok(None)
 }
 

diff --git a/src/bin/yank.rs b/src/bin/yank.rs
index e672898a3a5ab516585243f5ae8ce5abd356270f..f9812154b92bffbb9166837c822f801d7210e45b 100644 (file)
--- a/src/bin/yank.rs
+++ b/src/bin/yank.rs
@@ -1,5 +1,5 @@
 use cargo::ops;
-use cargo::util::{CliResult, CliError, Config};
+use cargo::util::{CliResult, Config};
 
 #[derive(RustcDecodable)]
 struct Options {
@@ -46,9 +46,7 @@ pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
                    options.flag_vers,
                    options.flag_token,
                    options.flag_index,
-                   options.flag_undo).map_err(|e| {
-        CliError::from_boxed(e, 101)
-    }));
+                   options.flag_undo));
     Ok(None)
 }